From 1e0510680184e1e05110c2f6a7ebf8028b22adfd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Jan 2006 05:23:24 +0000 Subject: [PATCH] Fix several g_new() calls which were using extra indirections or pointless 2006-01-18 Matthias Clasen * gtk/gtkrbtree.c: * gtk/gtktreemodel.c: Fix several g_new() calls which were using extra indirections or pointless casts. (#327423, Morten Welinder) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/io-gif.c | 2 +- gtk/gtkrbtree.c | 2 +- gtk/gtktreemodel.c | 4 ++-- 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a51929786..db1fd1a605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-18 Matthias Clasen + + * gtk/gtkrbtree.c: + * gtk/gtktreemodel.c: Fix several g_new() calls which + were using extra indirections or pointless casts. + (#327423, Morten Welinder) + Tue Jan 17 19:27:59 2006 Tim Janik * gtk/gtkprogress.c: fix adopted from maemo-gtk. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3a51929786..db1fd1a605 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-01-18 Matthias Clasen + + * gtk/gtkrbtree.c: + * gtk/gtktreemodel.c: Fix several g_new() calls which + were using extra indirections or pointless casts. + (#327423, Morten Welinder) + Tue Jan 17 19:27:59 2006 Tim Janik * gtk/gtkprogress.c: fix adopted from maemo-gtk. diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 5573dc4757..08f86164f9 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2006-01-18 Matthias Clasen + + * io-gif.c (gdk_pixbuf__gif_image_load_increment): Don't cast + the results of g_new(). (#327423, Morten Welinder) + 2006-01-12 Federico Mena Quintero * gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate): Clarify diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c index 4aa099a82d..b403d6fa59 100644 --- a/gdk-pixbuf/io-gif.c +++ b/gdk-pixbuf/io-gif.c @@ -1576,7 +1576,7 @@ gdk_pixbuf__gif_image_load_increment (gpointer data, /* prepare for the next image_load_increment */ if (context->buf == buf) { g_assert (context->size == size); - context->buf = (guchar *)g_new (guchar, context->amount_needed + (context->size - context->ptr)); + context->buf = g_new (guchar, context->amount_needed + (context->size - context->ptr)); memcpy (context->buf, buf + context->ptr, context->size - context->ptr); } else { /* copy the left overs to the begining of the buffer */ diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 32ac571933..b4f70641dd 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -334,7 +334,7 @@ _gtk_rbtree_new (void) { GtkRBTree *retval; - retval = (GtkRBTree *) g_new (GtkRBTree, 1); + retval = g_new (GtkRBTree, 1); retval->parent_tree = NULL; retval->parent_node = NULL; diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 05b93ab926..377108bebd 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -328,7 +328,7 @@ GtkTreePath * gtk_tree_path_new (void) { GtkTreePath *retval; - retval = (GtkTreePath *) g_new (GtkTreePath, 1); + retval = g_new (GtkTreePath, 1); retval->depth = 0; retval->indices = NULL; @@ -441,7 +441,7 @@ gtk_tree_path_to_string (GtkTreePath *path) if (path->depth == 0) return NULL; - ptr = retval = (gchar *) g_new0 (char *, path->depth*8); + ptr = retval = g_new0 (gchar, path->depth*8); g_sprintf (retval, "%d", path->indices[0]); while (*ptr != '\000') ptr++; -- 2.30.2